LPS-34871

split into manual/generated commits