Merge pull request #826 from valentinewallace/raise-max-to-self-delay