aofs-08 #606 (aofs-08)