aofs-09 #369 (aofs-09)