aofs-11 #585 (aofs-11)