Merge branch 'develop' into feature-ifaces
Defined primitive interfaces.
Merge branch 'feature-ifaces' into develop