Merge "Update the API version checks." into jb-dev