aofs-09 #518 (aofs-09)