SONAR-4851 Normalize margins