The PR is updated with a simplified patch and updated docs.