Namespaces with "\" in declaration broke down line counting
Merge branch 'master' into in-portal