Merge "Add trace points for measuring performance"