aofs-11 #529 (aofs-11)