aofs-08 #577 (aofs-08)