Bug/8779 msftidy post merge hook

Trying this again.