aofs-11 #548 (aofs-11)