Merge branch 'bugfix/17425-dont-propose-upgrading-to-running-version' into stable (Closes: #17425, #17026)