aofs-10 #438 (aofs-10)