aofs-12 #631 (aofs-12)