aofs-10 #522 (aofs-10)