Addition to maintenance PR #5783