[TO_STAGE] Stage fix for bugs 968952 and 969165