LF-13525 - Edit support