aofs-10 #518 (aofs-10)