Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how...