aofs-10 #345 (aofs-10)