edit save image callback
Merge branch '1206-6'