aofs-09 #590 (aofs-09)