Merge branch 'runtime-fixes' into 'develop'