aofs-09 #396 (aofs-09)