LF-9826: Updates per review