CON-1707 | Use mixin