sync of nansencenter:master into akorosov:master