aofs-09 #639 (aofs-09)