aofs-10 #397 (aofs-10)