aofs-09 #539 (aofs-09)