Merge branch 'release/v1.4'
Merge branch 'develop'
Merge branch 'release/v1.4.1'
Group methods by entities they act on
Add support for displaying messages
Merge branch 'master' into develop