Merge "Fix PRH CSITs with additionalFields"