Merge "2.0 translator: workaround for nVidia "bug""