Combined delegate and scrollViewDelegate
Merge branch 'scrollviewdelegate'