Merge "Make OMAPI stricter"