BC-1749 #resolve.