Merge pull request #6517 from kurund/version-fixes