issue #21306: order modules consistently