CNEBRICKS-10 #resolve