CON-1788 | changed hard-code to a mixin