aofs-12 #562 (aofs-12)