PLAT-6880 - Deadlock in static constants

Fixed circular references in static constants
Reviewed by Julian