aofs-09 #551 (aofs-09)