merge dev_4_4 -D org -I include -E exclude: PR 20 (Numpy imports 10217)
merge dev_4_4 -D org -I include -E exclude: PR 21 (Fix headers of scripts to match coding standard.)