aofs-09 #613 (aofs-09)