aofs-10 #627 (aofs-10)