Development branch to deal with merge of v3_6_STABLE revisions from 6917 to 6959 inclusive into the UKMO GO6-M branch.