aofs-10 #514 (aofs-10)