aofs-12 #564 (aofs-12)