Merge branch 'aw/rebase-am-failure-detection'