[TO_STAGE] Fix bug 969605