aofs-07 #316 (aofs-07)