aofs-10 #385 (aofs-10)