aofs-08 #631 (aofs-08)