WEB-3 merge fix