More work on edge to edge.
#MBL-10114