aofs-10 #418 (aofs-10)