Merge branch 'feature/RuntimeProperty' into develop