aofs-10 #354 (aofs-10)