CB-6776 (use _.extend instead of custom mixin function)