Merge "Flag guard avalanche changes" into main