Merge branch 'gr/rebase-i-drop-warn'