Merge "Check version before calling new API"