Merge "Mark single-assignment fields in PM server as "final"." into main