LPS-22792 SF
LPS-47362 Removes forgotten buffer