Merge "Allow duplicate release config maps and build flag declarations" into main