Pull Annex60 into new branch issue51_BESTEST