aofs-08 #581 (aofs-08)