Merge branch 'hotfix/v1.20.2'
Use production during production docker build
Merge branch 'hotfix/v1.20.3' into develop