aofs-08 #571 (aofs-08)