GF-55832: rc branch