promt offer fixes
Merge branch 'master' into promt-offer-fixes