aofs-09 #582 (aofs-09)