Merge remote-tracking branch 'eg-working/user/dbs/lp894052-version-upgrade'