Changes made by aui-upgrade-tool