merge dev_5_0 -D org -I include -E exclude: PR 851 (Version history for 4.4.10 (rebased onto dev_5_0))