aofs-08 #555 (aofs-08)