FIX: avoid milestones in margin calculation
Merge pull request #2157 from altatof/fix_margin_jalon

FIX: avoid milestones in margin calculation