Merge branch 'runtime-static-plug' into 'develop'