aofs-10 #572 (aofs-10)