aofs-09 #633 (aofs-09)