[PR #3830/5d3d35c2 backport][3.23] At export, enforce content-order as a last-step.

[PR #3830/5d3d35c2 backport][3.23] At export, enforce content-order as a last-step. #816