added where and postfix to output merge paths
Merge remote-tracking branch 'origin/master' into localBranchDisk1