aofs-10 #604 (aofs-10)