aofs-09 #517 (aofs-09)