aofs-10 #549 (aofs-10)