Merge branch 'mg/config-symbolic-constants'