321d7d4 (HEAD, refs/heads/src) reduced margins