[OEM-255] refactored to allow non-specification of margins