MA added an interval avoidance test
Merge origin/master