Address review comments (PR##7565)