cherry pick configuration changes from browserstack local branch #69

Closed SabotageAndi closed 2 years ago