fixes #1665
fixed a toolbar test with new behavior
Merge remote-tracking branch 'origin/pr/1679' into develop