aofs-12 #578 (aofs-12)