Update notes for submitted changes

* Move all shelve code paths to BDM objects