sync 8.09 with some changes from trunk