merge dev_4_4 -D org -I include -E exclude: PR 559 (remind that model changes may affect IceMapper (rebased))