BC-1481 #resolve.