Refinement of the NOR to more conform with the 2013-2016 ISAF template.