Merge branch 'release/8.4.5' into GH-1813/feature/in-app-plus-promo-u… …

…pgrade

wlycdgr committed Oct 18, 2019