Fix top scroll
Merge branch 'MH-911' into dev