Minor fix
Merge branch 'develop'
Minor fix
Suppress cursor flicking issue
Merge branch 'develop'
Minor fix