aofs-10 #540 (aofs-10)