aofs-09 #583 (aofs-09)