aofs-07 #570 (aofs-07)