Merge branch 'en/rebase-i-microfixes'