se-162 final code review comments.
Merge branch 'dev/se-162' into dev/fend-1032