Merge remote-tracking branch 'origin/matej/toolbar-refactoring' into devel
API changes