aofs-08 #564 (aofs-08)