Merge remote-tracking branch 'origin/feature/ISTWCMS-4941-ebremner-multi-type-listing-buttons' into 3.0.x