Backport 9872a700284f35855c3931fb3eee5c5462acdb04
Fix merge issue