#5100-5099: Toolbar was added
Merge branch 'devel' of https://github.com/OSLL/sca into devel