[CB6947] move app directory by default. for file-by-file use parameter merge=