aofs-10 #596 (aofs-10)