Merge "Bump version to 2310 to account for RS object change."