Merge branch 'en/pull-conflicting-options' into maint