[TO_STAGE] Fix for bug 1021467, 1020440, 1021041