aofs-11 #394 (aofs-11)