Merge "Test util for shade that accounts for flag values" into main