aofs-08 #637 (aofs-08)