aofs-11 #564 (aofs-11)