aofs-09 #614 (aofs-09)