aofs-09 #641 (aofs-09)