Refs #4338: adress remarks from the PR