Merge remote-tracking branch '6a68/issue_2364_upstream_selenium_changes' into issue_2364_upstream_selenium_changes