BC-1471 #resolve.