Restore user config when cherry pick finished & fix dot problem.