Try to backport fix to fix conflicts