aofs-08 #525 (aofs-08)