aofs-12 #338 (aofs-12)