sync 8.09 with changes from trunk