Ticket for improvement mentioned here:
https://docs.google.com/document/d/1fEXCLTAxEDk57kYdZvj6B3J6utmIe3zROVd1860mTC8/edit#heading=h.qsi3eyce76j2