BC-1468 #comment not complete.
BC-1469 #resolve.