Annex60 sync

Merge changes from the `Annex60` library to the master branch.