aofs-11 #599 (aofs-11)