Merge branch 'promotions' into admin-section