CRUNCH-677 fix merge mistakes
5 files changed