merge dev_4_4 -D org -I include -E exclude: PR 36 (Fix Movie_Figure script)