merge master to nine
fix the one failing test