FORGE-916 Initial implementation of support for bidirectional deletes