AJ-1573 complete metric order persistence