changes from 2913 for multiple issues with upgrader