aofs-09 #637 (aofs-09)