aofs-10 #237 (aofs-10)