Merge remote-tracking branch 'origin/bugfix/looser-memory-requirements-for-upgrades-check' into devel