aofs-08 #638 (aofs-08)