aofs-08 #535 (aofs-08)