fix s0 amend issue

Sushil Khanchirequested to merge
topic/default/fix-s0-amend-issue into branch/default

Merge request reports