aofs-08 #565 (aofs-08)