aofs-10 #394 (aofs-10)