Library and tool updates
fix merge conflicts