CON-806: use calc mixin