Merge pull request #289 from lbl-srg/Annex60Sync

Annex60 sync