aofs-08 #513 (aofs-08)