Fixing TOOLS-2477 - Property Mediator property issues