Merge branch 'refactor/config-get' into 'develop'