KNIFE-312 merging in latest master