[IMPROVEMENT] Circle will trigger MouseWhell Scroll
[MERGE] fix conflicts