aofs-10 #317 (aofs-10)