addressed issues for cs

Jasjeet Brarrequested to merge
issue/easy_breadcrumb-3421456:3421456-fix_cs_issues into 2.x

Closes #3421456

Merge request reports