Update selection helpers and fix selection trim.
Merge branch 'origin/master'
Deep extend presets