aofs-12 #339 (aofs-12)