aofs-12 #325 (aofs-12)