aofs-08 #641 (aofs-08)