Merge branch 'crolke-DISPATCH-311'