Stories Cherry Picked from 6.6.3a branch