7.x-2.6
6bdb0ffd · Bit of code from Issue #2000432 that missed in the revert ·