Merge verified main review fixes for production

# Conflicts:
#	apps/pac-service/src/modules/plan-aggregate/plan-aggregate.service.ts
#	apps/pac-service/src/modules/sync/pipeline/fact-writer.service.ts