LPS-33240 Append only when necessary