aofs-08 #559 (aofs-08)