BC-1480 #resolve.