aofs-12 #534 (aofs-12)