aofs-08 #518 (aofs-08)