csboling Merge branch 'max-dur-always-tie' into csboling-dev