aofs-09 #604 (aofs-09)