Merge from mellanox-v1.8 internal branch