This is an unreleased bugfix that we want to deploy. Manually patch it into the software using patch in the container image build process. Once the next release happens we should be able to remove this patching workaround. Change-Id: I3bf42dcb4c5ce5d35818f05e57400602595403c7