aofs-09 #368 (aofs-09)