Merge "Gate default with explicit flag" into main