cherry-pick 1

• Use Git to Undo Change and Rewrite History Feb 28, 2017