aofs-10 #559 (aofs-10)