aofs-11 #568 (aofs-11)