aofs-07 #363 (aofs-07)