PURE-188: Fix GWT2 build
Merge branch 'master' into Release-2.0.0