Merge the rest from header branch.