Merge branch 'wc/rebase-insn'