merge trunc

master trunc merged