Issue #24111:clarify margin calculation