Merge "Omit self_type and referenced_type" into main