Changed uppercase L to lowercase l in class name
Merge remote-tracking branch 'origin/pr/1346' into develop

Forward port #1346