Merged Annex60:issue95_nominal branch