Merge branch 'config-variables-unification' into 263