Merge branch 'CRUNCH-630'