aofs-09 #593 (aofs-09)