aofs-08 #549 (aofs-08)