Updates for APPENG-3099
Adding patches from Fedora APPENG-3124
Restore promote only if code