(M-19911): Unify C5-2368 and U-00024605; use