test merge of akorosov:master into nansencenter:master after merging at akorosov