aofs-11 #525 (aofs-11)