Merge branch 'mix_config_deprecation' into 'develop'