Made Local change to Wand
Further change.
Merge 'origin/master' into 'master'