CGIV-4304: Pass version if specified