aofs-10 #623 (aofs-10)