merge dev_4_4 -D org -I include -E exclude: PR 842 (Version history for 4.4.10)