Merge "Bump apex version"