Apply patch 1/2 for submodule web
9 files changed