aofs-09 #479 (aofs-09)