#825: review comment changes done