Merge branch 'feature/disable-gesture-check'