Use same virtual profile detection code in all places
Merge remote-tracking branch 'bingmann/master'
Fixed integer test expressions