LPS-35986 Applied the pattern from Journal
LPS-35986 Handled auto draft with small image updates