Merge pull request #2749 from dibdot/wg