Merge branch 'jk/rebase-am-fork-point'