aofs-08 #573 (aofs-08)