Merge "Honor API version from CoreDocument" into main