Fix merge with 35eef702b195a9546fbf9e0293641cf6eef025c5