Merge "Add more version checks."