aofs-10 #570 (aofs-10)