aofs-12 #577 (aofs-12)