add select from Gallery Support
Merge branch 'add-gal-select' into rework-tpa