BC-1465 #resolve