aofs-10 #534 (aofs-10)