Naming standard(s)
Merge branch '2.1.x'