aofs-10 #436 (aofs-10)