Merge "Extend hack to new driver version"