scrollableFrames fix
Merge branch 'v1.6.0-more'
scrollableFrames fix