aofs-10 #496 (aofs-10)