Merge branch 'fix/runtime-config' into 'develop'