Merge "Remove make version check"