Merge branch 'fix/configdb-missing-s3-region' into 'develop'