Corrected assertions in scroll_display
updated merge
Merge remote-tracking branch 'origin/master'

fetch and merge