merge dev_4_4 -D org -I include -E exclude: PR 37 (Create image from old 11426)