See PR description.