aofs-08 #542 (aofs-08)