aofs-09 #382 (aofs-09)