Issue #201: Runtime refactoring
Issue #201: Runtime refactoring
Issue #201: Runtime refactoring
AISG-1076 Moved to version 2.4.0
Issue #201: Runtime refactoring into master