Handle possible warnings.
Merge branch '1.x'