Minor change to inline documentation
Extract pe-build config merging logic
Rename late_config_merge, ensure configs are finalized
Merge branch 'late_finalize_config'