aofs-11 #527 (aofs-11)