aofs-08 #551 (aofs-08)