• Merge branch 'develop' into GH-1593_and_GH-1594/UpgradePlus-banner-an…

    …d-logo
    wlycdgr committed Apr 16, 2019