Issue 7079: minor changes to cece09c3