Issue #201: Runtime refactoring into master