aofs-07 #254 (aofs-07)