aofs-09 #316 (aofs-09)