Merge branch 'ab/rebase-fatal-fatal-fix'