issue #21870: fixed manifest order