Code refactoring carried out in RT #43929 and RT #45186 needs to be
thoroughly unit tested to ensure no bugs were introduced in the process.