aofs-08 #397 (aofs-08)