aofs-10 #635 (aofs-10)