warning: only apply after (or at the same time as) LHCb!1701 (merged). Applying this MR without that one will result in code that does compile, but which will result in an out-of-bounds access...
