update codes to latest Trunk codes