aofs-08 #570 (aofs-08)