Merge branch 'rt/rebase-i-broken-insn-advise' into maint