Merge "Fix readOnlyApnFields not applied" into main