Work around wrong value obtained from registry
Merge branch 'master' into viasat