aofs-09 #547 (aofs-09)