Thanks jcl. Yes, this is a partial workaround, but doesn't really address the issue. For example, for all trades that never go negative during their lifetimes, the 50% additional MarginCost is wasted, preventing trades or lowering the size of entered trades.

Is there another solution that is less restrictive and closer approximates the ESMA situation?

Thanks.