Merge "seeing a 10x slowing down, revert now for investigation"