merge dev_4_4 -D org -I include -E exclude: PR 58 (1822 script param fix dev 4 4)