Merge "Add/clean up options in demo and ete scripts"