Merge branches 'dropdown', 'htmlblock', 'scrollback' and 'word-break' into dev