Merge branches 'dropdown', 'htmlblock' and 'scrollback' into dev