341.1-trenches-code-upgrade