aofs-11 #530 (aofs-11)