merge dev_4_4 -D org -I include -E exclude: PR 480 (Script sample gh 470)