replaced --append with --afile
Merge branch '0.10' into scenario-support