aofs-12 #340 (aofs-12)