aofs-11 #596 (aofs-11)