aofs-11 #587 (aofs-11)