scroll fix
Merge branch 'clearcap' into testing