Merge strict-naming branch.