Created by: portnov
This ports #2457 to 2.80 branch. This also makes the new (more precise) mode the default one.