aofs-12 #370 (aofs-12)