aofs-12 #367 (aofs-12)