Merge branch 'jc/advice-about-to-lose-commit'