Merge "GUP: Update global property for the new dev opt"