merge WG changes from 0.8.10 to 0.8.11