aofs-12 #316 (aofs-12)