aofs-08 #636 (aofs-08)