aofs-12 #537 (aofs-12)