aofs-09 #565 (aofs-09)