Group products table adjustments
Product selector adjustments
Merge remote-tracking branch 'origin/dev'