merge dev_5_0 -D org -I include -E exclude: PR 860 (UpgradeChecker: fix the stable version number)