Merge "DO NOT MERGE Ensure mapping between internal and public insets" into rvc-qpr-dev