merge new commits from caf