Update tracking diff with patches from trunk