aofs-11 #620 (aofs-11)