aofs-09 #529 (aofs-09)