aofs-09 #568 (aofs-09)