Fixed jumping issue
2dSettings
Merge remote-tracking branch 'origin/Aurora'