aofs-08 #635 (aofs-08)