[PATCH] Fix for --merge-order, --max-age interaction issue