Close #3453034 Re-export config to handle configuration drift.

added 14 commits

• 76090ced...f98dd03a - 13 commits from branch project:4.x
• 8aa6eb69 - Merge branch environment_indicator:4.x into 3453034-re-xport-config

Compare with previous version