aofs-12 #596 (aofs-12)