aofs-12 #635 (aofs-12)