Hotfix: Remove Sonar Blocker: Trailing Commas