* commit 'a501e2536b36f0f566ed312fe1a3fa17fd48e55f': UGW_SW-20511-addressing-review-comments-UGW_SW-21375-UGW_SW-21409