aofs-09 #570 (aofs-09)