CNEBRICKS-16 #resolve