Merge "Get api version / remove hardcoded v2"