changes after code review
Merge branch 'bugid-100140' into consumer-wam