aofs-09 #528 (aofs-09)