LPS-47366 Removes buffer on expando
LPS-47369 Removes buffer on users admin
LPS-47366 SF
LPS-46416 SF
LPS-47368 SF
SF