aofs-12 #479 (aofs-12)