Adapt dynamic margin condition

bench: 6992645