Merge "[PMSH] Fix AAI api versioning"