Resolve #3461463 "Fix the issues"

sarwan verma requested to merge issue/content_type_audit-3461463:3461463-fix-the-issues into 1.0.x Jul 16, 2024