aofs-11 #534 (aofs-11)