fixup! Bug #5741 (fix mistakes in ESR31 rebase)