Merge branch 'fix/dynamic-configuration' into 'develop'