BC-1449 #resolve