Merge "Remove support for wgUseESI"