aofs-08 #534 (aofs-08)