aofs-10 #517 (aofs-10)