Merge remote-tracking branch 'origin/release' into merge-release

# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json

Author: mansona

files/app/config/environment.ts

@@ -26,6 +26,7 @@ assert(
 
 export default config as {
   modulePrefix: string;
+  podModulePrefix?: string;
   locationType: string;
   rootURL: string;
   APP: Record<string, unknown>;