aofs-07 #467 (aofs-07)