LPS-44476 with contributions