aofs-10 #589 (aofs-10)