* First commit Cherry-picked from #6666 * Adjust release version number Just in case we decide to make a release before we merge #6666