Merge branch 'jk/am-skip-hint'