#6435 Address review