aofs-09 #549 (aofs-09)