Merge "Fix device detection and path to tapas"