CUST-156 make the build